From 959d1a7283f5e8eda3744e30d0dd5809c2d1ecd8 Mon Sep 17 00:00:00 2001 From: Alex Crichton Date: Fri, 21 Aug 2015 11:44:16 -0700 Subject: [PATCH] Update for Rust nightly * Update dependencies that are getting warnings on nightly * Tweak expected output of failing tests --- Cargo.lock | 24 ++++++++++++------------ tests/test_cargo_test.rs | 4 ---- 2 files changed, 12 insertions(+), 16 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index fe95feb53..a8ec3f854 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -20,7 +20,7 @@ dependencies = [ "log 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", "num_cpus 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)", "regex 0.1.41 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc-serialize 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)", + "rustc-serialize 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)", "semver 0.1.20 (registry+https://github.com/rust-lang/crates.io-index)", "tar 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", "tempdir 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", @@ -72,7 +72,7 @@ name = "crates-io" version = "0.1.0" dependencies = [ "curl 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc-serialize 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)", + "rustc-serialize 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -105,7 +105,7 @@ version = "0.6.70" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "regex 0.1.41 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc-serialize 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)", + "rustc-serialize 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)", "strsim 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -178,7 +178,7 @@ name = "hamcrest" version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "num 0.1.26 (registry+https://github.com/rust-lang/crates.io-index)", + "num 0.1.27 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -269,11 +269,11 @@ dependencies = [ [[package]] name = "num" -version = "0.1.26" +version = "0.1.27" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "rand 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc-serialize 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)", + "rand 0.3.10 (registry+https://github.com/rust-lang/crates.io-index)", + "rustc-serialize 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -310,7 +310,7 @@ dependencies = [ [[package]] name = "rand" -version = "0.3.9" +version = "0.3.10" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "advapi32-sys 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", @@ -335,7 +335,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "rustc-serialize" -version = "0.3.15" +version = "0.3.16" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] @@ -362,7 +362,7 @@ name = "tempdir" version = "0.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "rand 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)", + "rand 0.3.10 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -394,7 +394,7 @@ name = "toml" version = "0.1.22" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "rustc-serialize 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)", + "rustc-serialize 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -403,7 +403,7 @@ version = "0.2.37" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "matches 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc-serialize 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)", + "rustc-serialize 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] diff --git a/tests/test_cargo_test.rs b/tests/test_cargo_test.rs index 52860ec6c..a3522c4f5 100644 --- a/tests/test_cargo_test.rs +++ b/tests/test_cargo_test.rs @@ -212,10 +212,6 @@ test result: FAILED. 0 passed; 1 failed; 0 ignored; 0 measured ", COMPILING, p.url(), RUNNING)) - .with_stderr(format!("\ -thread '
' panicked at 'Some tests failed', [..] - -")) .with_status(101)); }); -- 2.30.2